From f3f62347b3ee304c83a3b8e0c14e9ab04c957f82 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 12 Dec 2001 22:15:27 +0000 Subject: [PATCH] Remove validate_rows_timer in unrealize. Reported by Matthew Wilson. Wed Dec 12 16:43:10 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove validate_rows_timer in unrealize. Reported by Matthew Wilson. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 6 ++++++ 8 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 02f0de5c4b..1b4cb5256a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 12 16:43:10 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove + validate_rows_timer in unrealize. Reported by Matthew Wilson. + Wed Dec 12 16:18:26 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_realize): Remove support for diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index b222d48121..e34f3d9346 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1325,6 +1325,12 @@ gtk_tree_view_unrealize (GtkWidget *widget) tree_view->priv->presize_handler_timer = 0; } + if (tree_view->priv->validate_rows_timer != 0) + { + gtk_timeout_remove (tree_view->priv->validate_rows_timer); + tree_view->priv->validate_rows_timer = 0; + } + for (list = tree_view->priv->columns; list; list = list->next) _gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data)); -- 2.30.2